portalHelper: Don't use deprecated API during policy decision

NavigationPolicyDecision.get_request() is deprecated, and the
method from the corresponding NavigationAction should be used
instead.

Rearrange the code to do that.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2690>

diff --git a/js/portalHelper/main.js b/js/portalHelper/main.js
index 8560a4958f888ac014ef2dd8d95c6e74bd97599b..9e2b133ae199cd168d3baa8f12245218bb75e874 100644 (file)
--- a/js/portalHelper/main.js
+++ b/js/portalHelper/main.js
@@ -207,8 +207,13 @@ class PortalWindow extends Gtk.ApplicationWindow {
     }
 
     _onDecidePolicy(view, decision, type) {
+        if (type === WebKit.PolicyDecisionType.RESPONSE)
+            return false;
+
+        const navigationAction = decision.get_navigation_action();
+        const request = navigationAction.get_request();
+
         if (type === WebKit.PolicyDecisionType.NEW_WINDOW_ACTION) {
-            let navigationAction = decision.get_navigation_action();
             if (navigationAction.is_user_gesture()) {
                 // Even though the portal asks for a new window,
                 // perform the navigation in the current one. Some
@@ -217,17 +222,13 @@ class PortalWindow extends Gtk.ApplicationWindow {
                 // user go through. We don't risk popups taking over
                 // the page because we check that the navigation is
                 // user initiated.
-                this._webView.load_request(navigationAction.get_request());
+                this._webView.load_request(request);
             }
 
             decision.ignore();
             return true;
         }
 
-        if (type !== WebKit.PolicyDecisionType.NAVIGATION_ACTION)
-            return false;
-
-        let request = decision.get_request();
         const uri = GLib.Uri.parse(request.get_uri(), HTTP_URI_FLAGS);
 
         if (uri.get_host() !== this._uri.get_host() && this._originalUrlWasGnome) {